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

JULY 2019.4
Bug: 131238123
Signed-off-by: Vishal Agarwal <agarwalvishal@google.com>

Change-Id: I5628a4f3334a55260a4a4dd763059b0e5aff1a8f