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

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



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