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