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