Merge changes from topic "bugreporting-aosp-sync" am: 8fafabfed1 am: 111f411617 am: 2c51591cc8

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

Change-Id: Ibca516826843868839ac0fc9e11d856737e594c2