Merge "bugreport: fix warning." am: 734f0a2fa1 am: 1a46ec978a am: 40a2807df4 am: b56bbad67e

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

Change-Id: I3c47bde8741debeb17d3c0499d87f84b67e4b331