Merge "Merge changes I30a2fa4f,I1abd1561 into rvc-dev am: 5bbeb33ec9 am: c3d6c2815a am: ae8b76402a" into rvc-qpr-dev-plus-aosp am: 7ea0524210
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11966041 Change-Id: Ia59d8302c47daf334994674f5e2edb6b089995cb
This commit is contained in: