Android mainline 12.0.0 release 6
Merge cherrypicks of [15347097, 15347098] into sparse-7550996-L60300000950383421

Change-Id: Iabb3b47d2ddcbb3477a5c531ac23dfb0f3e392c2