Android Platform 12.0.0 Release 12 (8968633)
Merge cherrypicks of [17004678] into sc-platform-release.

Change-Id: I941fad2bbf2640f4bcce8c8f7b20435015486474