Merge "Merge changes I3b8babc2,I56ea3eee into rvc-dev am: 3a8b73a881" into rvc-dev-plus-aosp am: 3cc9f00077 am: 8f6091b4e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11694355 Change-Id: I9f8348e4f52fd186834ef5448cde517d0861e8aa
This commit is contained in: