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

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

Change-Id: Ia481193cdbd62c60d572db1c087597b439348ebd