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

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

Change-Id: I416dbd8c9107e9fb2c6c363d9606a2d6aff2c08f