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

APR 2019.2

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