Merge changes I30a2fa4f,I1abd1561 into rvc-dev am: 5bbeb33ec9 am: 0eb4ee71b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11966041 Change-Id: Iab94818f810b5aca1ae31ef89637190da8e22f03
This commit is contained in: