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

JULY 2019.4

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