Merge branch 'android-msm-marlin-3.18-pi-qpr3' into android-msm-marlin-3.18

JUN 2019.5

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