Android 9.0.0 release 20
Merge cherrypicks of [5337900] into pi-qpr1-release

Change-Id: I598e03c717e351c29d31f413e3f3132ecd3c4d09