Android 9.0.0 Release 0.61 (PQ2A.190205.003,marlin/sailfish)
Merge android-msm-marlin-3.18-pi-qpr1 into -pi-qpr2

Change-Id: If9df894dc0e049cd1951b95190ae8c09ec0ace0f
Signed-off-by: Petri Gynther <pgynther@google.com>