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

Change-Id: I94fbc739cde7ab3f34879ccdab770b90ffc20b47