Android 8.1.0 Release 25 (OPM2.171019.029.A1)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWuiligAKCRDorT+BmrEO
eODFAKCAJL5JM9sCc3Yu+CrSm7TGG+YzpQCeJxGXjXAyZEGccRXd+6MiQA8J50Q=
=CIAJ
-----END PGP SIGNATURE-----
Merge cherrypicks of [3898937, 3898958, 3899077, 3897885, 3898496, 3898245, 3898959, 3898960, 3897790, 3898312, 3898313, 3898314, 3899155, 3899156, 3899157, 3898289, 3898290, 3899061, 3898291, 3898292, 3896951, 3899158, 3898961, 3898938, 3898246] into sparse-4657601-L30800000163316240

Change-Id: I7fb38efbc6add86c8877cb20e040e7adf87dacf6