Merge "Merge changes I06d91234,I8a195b3e into rvc-dev am: 5a53824868 am: b868aa0750 am: ea111aaf63" into rvc-qpr-dev-plus-aosp am: 93f3a16349
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11936027 Change-Id: I018fce522a647eb6bb1bdd3539ddca23c3d86aec
This commit is contained in: