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

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

Change-Id: I6cb759ffa331c8cce4a2cb51858581df7bc41f77