Android 9.0.0 release 40
Merge cherrypicks of [7293852, 7293854, 7292377, 7293923] into pi-qpr3-release

Change-Id: Ie6ebb46b57b8940004353211301eaa813ce560ba