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

Android 9.0.0 release 40

Change-Id: I0558a0a7c907c977097ad85cabfff23acb5aa378