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

Merge "Merge changes from topic "bugreport-stub" into rvc-dev am: 95689602 am: a7dad0b5 am: 1627e3cb" into rvc-qpr-dev-plus-aosp am: 59b659af

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

Change-Id: I7b82118c2700010dfd0c084a9064f52b053d98fc