Merge "Fix cert-dcl16-c warnings" am: d78c0842df am: a4e7dfab4c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1977907

Change-Id: I4ae11f4853a0b69267521b13b1c61b167b6b29e6