Merge changes I4fdf368e,Ibc6be890 into rvc-dev am: 48dc192499 am: 04fb24d142
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932511 Change-Id: I62d95dc565a031d9a0f9f1e8aa6a15be004e7136
This commit is contained in: