Merge "Merge changes I30a2fa4f,I1abd1561 into rvc-dev am: 5bbeb33ec9 am: 0eb4ee71b0" into rvc-d1-dev-plus-aosp am: 9c0918cadf am: 665eb4a50f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11966041 Change-Id: I7c66ba6b8d2382aa019fa2616d2f932b75b5a6ca
This commit is contained in: