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

MAR 2019.1

Bug: 122351661
Change-Id: I626a3e70984a1e6066fa28a7dc3401488ccb9795
Signed-off-by: Miguel de Dios <migueldedios@google.com>