Android 7.1.2 Release 36 (N2G48H)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWicTpAAKCRDorT+BmrEO
eDIiAJ9+Hiu7GqFVtyOM5DwPNS4Sx+s1VACfdruL1q6Yk9+QYV0/kSyxoEV/5Gg=
=u9qR
-----END PGP SIGNATURE-----
Merge cherrypicks of [3166006, 3165952, 3164925, 3164926, 3164927, 3164928, 3167313, 3167314, 3167315, 3167316, 3167317, 3167318, 3167319, 3167320, 3167321, 3167322, 3166318, 3166319, 3166320, 3166321, 3166322, 3166323, 3166324, 3167333, 3167334, 3167373, 3165112, 3166325, 3165229, 3165230] into nyc-mr2-release

Change-Id: I1ceb02446b2daf909b269a7e9a2777182546e414