Merge branch 'android-msm-pixel-4.9-qt' into android-msm-pixel-4.9-qt-qpr1

Bug: 139653239
Change-Id: Iaa140dd8135c027c071097f84662eff5bfeaaf95
Signed-off-by: Harrison Lingren <hlingren@google.com>