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

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

Change-Id: I0249f2de810c72b1714d2e24135e4c73f458c2e4