Android 9.0.0 release 20
Merge cherrypicks of [5285346, 5285158, 5284278] into pi-qpr1-release

Change-Id: Ie48ea2e6d0af7b1ffcb89f9e2c5e524c6fb50a40