Merge changes from topic "bugreporting-aosp-sync" am: e33307926c am: a6f23701ac am: 5fccda2ffe am: a205e4c788

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

Change-Id: I9c2b7d758cb043fd9565397cbdfad866ed51d88a