Merge changes from topic "12933477" into rvc-dev am: 6a6a15d595 am: 5fe0e5eda3 am: 69f60a9090

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

Change-Id: I7cfe7b471162ce3e6c94bcc7bddd639a2fbdfeff