Android 9.0.0 release 22
Manually merge changes from giant AOSP topic

Change-Id: Ibcb55155d2c3e9afb9f6f023dba3bac11da223fb