Merge remote-tracking branch 'goog/qcom/LA.UM.7.1.r1-04500-sm8150.0' into pi-dev
am: 4d6c270149

Change-Id: I56845e2243f4f1f688903fdbdec3454a7d06d01d