Merge changes Ia7d9514e,I3e9e4f47 into rvc-dev am: 5cc486b1a1 am: d6b31c540b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11920861 Change-Id: I57a5240ce7fd733d6939b881459dc5f89074fe0a
This commit is contained in: