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

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



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