Merge "Deprecate legacy_android10_support" am: 24507dc4ea am: 77fff26af7

Change-Id: Ic3a048652fe12404014af2de48954b9f45ac22d6