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

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

Change-Id: Id595a8abf5de8be825256ef5b4adbefd561e95d5