Android CTS 12.1.0 release 1
Merge cherrypicks of [16713882] into sc-v2-release.

Change-Id: Id87685699ee7b71c91956c0e03a3c25d8fe18f1d