Android CTS 11.0 Release 7 (8072971)
Merge "Snap for 8061071 from e5e9acc7a5986436e73b0eac1ecc3481d0c0aa8d to android11-tests-release" into android11-tests-release