Merge "Merge "Fix compile warnings" am: 0cdcf50d am: fa5ec0a4 am:...

Merge "Merge "Fix compile warnings" am: 0cdcf50d am: fa5ec0a4 am: 35510451 am: 6515ccff am: 2da47254" into udc-qpr-dev-plus-aosp am: cff7a415

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



Change-Id: I4c1af6b469f255ff6d0a3780861d5bd515bea380
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>