Merge "Deprecate legacy_android10_support" am: 24507dc4ea

Change-Id: I4ecf6974646bb5ae3735f9dada752d73b4db998a