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

JULY 2019.3

Bug: 131239907
Change-Id: I93583aca7cc5dcff7d62f7ba0eb771dcbada653f
Signed-off-by: Kelly Rossmoyer <krossmo@google.com>