Merge changes from topic "bugreport-stub" into rvc-dev am: 95689602 am:...

Merge changes from topic "bugreport-stub" into rvc-dev am: 95689602 am: a7dad0b5 am: 8a017586 am: bc8fec30

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

Change-Id: Ie2dc8d2094be3f42eb13e561bda9aa4ef24332cc