Merge changes from topic "12933477" into rvc-dev am: 6a6a15d5 am: 5fe0e5ed

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

Change-Id: Ie05102661a2bcc3b5c00c6854373cab46589132f