Merge "Fixes a wrong cast position." into udc-dev am: f9142698 am: d4353e8b

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



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