Android 9.0.0 Release 46 (PQ3A.190801.002)
Manually merge changes from giant AOSP topic

Change-Id: Ifeb84090a15e9b35a6841bb7243908f4f34aa66a