Merge "Fix the error prone warmings from ag/22390888." into udc-dev am: 1c16bdc1 am: 0079e449

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



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