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

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

Change-Id: I31559d76a4c97fbbdd528e2647ca8be6081d08b1