Merge changes Ic92e29c6,I6e044606 into rvc-dev am: eb18301bd5 am: c03bbfcb7f am: 0dbb487124
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11886117 Change-Id: I3c3fad5d4a7bd6c3a5fed0050ff12f8f6bd604eb
This commit is contained in: