Merge changes from topic "bugreporting-aosp-sync" am: 8fafabfed1

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

Change-Id: Ie6cb1f3ca017d708c75d0d3641e2b5ea6de2799c