Merge android11-tests-dev.

Bug: 168333982
Change-Id: Iba67cbc8143bc0b2c31ae89525c9fb5293d4d466