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

Merge changes from topic "bugreport-stub" into rvc-dev am: 95689602 am: 5b622bb7 am: 1a2c396f am: 5a1d1713

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

Change-Id: I1d4003fe8ffe316c64d47538dc127b2a1c07d6f5