Merge tag 'android-9.0.0_r42' of https://android.googlesource.com/platform//frameworks/base into HEAD

Android 9.0.0 release 42

Change-Id: If622d18f062f222c2663f8861e4582f319a56722