Android 9.0.0 release 35
Merge cherrypicks of [6333813, 6333231, 6333198] into pi-qpr2-release

Change-Id: I408091e8646d90aac240e46117e6aa193069b4b2