Android mainline 12.0.0 release 93
Merge cherrypicks of [17507263] into sparse-8305876-L49600000953797171.

Change-Id: Iede1805bf0b0ca3f825aa258bb4bb296ab244d71