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

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

Change-Id: I68ccd9a5c7922836fb4e451b20417463e2db35c9