Merge changes Ia7d9514e,I3e9e4f47 into rvc-dev am: 5cc486b1 am: d6b31c54 am: 4485ee88 am: 14871027

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11920861

Change-Id: Ib4a1fcb01774d65ab9b4ed3852f0a8f614a5cd47