Merge branch 'android-msm-wahoo-4.4-pi-qpr1' into android-msm-wahoo-4.4-pi-qpr2

APR 2019.3

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