Android 9.0.0 release 22
Merge cherrypicks of [4948448, 4948511, 4948299, 4947854, 4947306, 4946150, 4948531, 4946116, 4948532] into pi-qpr1-release

Change-Id: I0da058074593bf706f43d8d6389a8e30bb46b09a