Android 9.0.0 Release 30 (PQ1A.190105.004)
Merge cherrypicks of [5499800, 5500052, 5499801] into pi-qpr1-release

Change-Id: Idc9bb56a73f6f8da142c733700de793aadf99cff