Android 9.0.0 Release 37 (PQ3A.190505.002)
Manually merge changes from giant AOSP topic

Change-Id: Ibcb55155d2c3e9afb9f6f023dba3bac11da223fb