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

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

Change-Id: Ie948bebadeb940302832803dd4ad9ebae38ef96c