Merge "Merge changes Ia7d9514e,I3e9e4f47 into rvc-dev am: 5cc486b1 am: f3dfb52c" into rvc-d1-dev-plus-aosp am: 9c8afa11

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

Change-Id: I377de051953bd6cd1fc5497fa514c5be44df0124