Android CTS 12.1 Release 9 (11400431)
Merge "Merge cherrypicks of ['android-review.googlesource.com/2945105'] into sparse-11392822-L17800030001796641. SPARSE_CHANGE: Icf51069c27d79557ec2dfa6462da1a557a717e48" into sparse-11392822-L17800030001796641