tree eb0f79aacd68724b0c0c091018384ef924380f47
parent 32aef7a2cf8ef3881e1efdce6cf693bc762cc604
parent 896de5423db1ec3824797e11199a08be20b02d1d
author Ethan Yonker <dees_troy@teamw.in> 1535127456 -0500
committer Ethan Yonker <dees_troy@teamw.in> 1535127459 -0500
mergetag object 896de5423db1ec3824797e11199a08be20b02d1d
 type commit
 tag android-9.0.0_r3
 tagger The Android Open Source Project <initial-contribution@android.com> 1532466463 -0700
 
 Android 9.0.0 Release 3 (PPR1.180610.011)
 -----BEGIN PGP SIGNATURE-----
 
 iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCW1eVHwAKCRDorT+BmrEO
 eBXsAJoC8oJ6PVcsVbVhEtDCx0QVNreGBgCfavuNZBDShufODFDQlZkawCtMDSM=
 =qHKW
 -----END PGP SIGNATURE-----

Merge AOSP android-9.0.0_r3

Fix conflicts and make it build in 5.1, 6.0, 7.1, 8.1, and 9.0

Change-Id: Ida0a64c29ff27d339b7f42a18d820930964ac6e4