Android 9.0.0 release 41
Merge cherrypicks of [7063125, 7062829, 7063145] into pi-qpr3-release

Change-Id: If0d01994b9ee415c659d050117de594a87513fe7