Android 9.0.0 release 12
Merge cherrypicks of [4798161, 4798540, 4798496, 4798431] into pi-dr1-release

Change-Id: If108f2c77cbea96a16a7111f8385e50ba545242b