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

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

Change-Id: Ibb57ddc1acdb5a4b2816803c0a2bb9af25154e8b