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