Merge changes from topic "bugreport-stub" into rvc-dev am: 9568960297 am: a7dad0b5cc

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

Change-Id: I38f827361f1f234e49c086953d0c0d7426e0d70f