Android mainline 10.0.0 release 4
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXeWABAAKCRDorT+BmrEO
ePhuAJ91T2QKhwyhVOIsJJVUd+xT2yPv1gCdEH1EfsGfYIdlirHjf8ZRYC0S3lw=
=2lW9
-----END PGP SIGNATURE-----
Sync with upstream 95647bc8:
am: 09980abea7

Change-Id: Ica63752553b101d41486cb958076af5db6ba17ba