Android mainline 12.0.0 release 4
Snap for 7653618 from af830bc1ea374c0d15c94501d5d30e2ec9f9fdce to sc-mainline-release

Change-Id: I5a177a4a37300e757000f69ccd0c735bf07fd7d0