Merge changes I037517d9,Ic603b271,I47fe530f into sc-qpr1-dev am: 44e5c9a0

Resolves merge conflict manually
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15836432

Bug: 201126018
Change-Id: I91e61c53bafff7f32be7c2fd3790f02d23875446
Merged-In: Ic603b2711c19299f01271131062765255451310a