Merge changes from topic "bugreporting-aosp-sync" am: e33307926c

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1465983

Change-Id: I2e1a1896ed48951443cafaaa185411e65c68737d