Merge "Move local variable to more localized scope" into udc-dev am: 1f61ce8436 am: 19e7971922

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

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