Merge branch 'android-msm-bluecross-4.9-pi-qpr1' into android-msm-bluecross-4.9-pi-qpr2

APR 2019.3

Bug: 123654997
Change-Id: I26ece033765f9baf56f69a8e516a628bf3ba3c25
Signed-off-by: Maggie White <maggiewhite@google.com>