Merge "Move local variable to more localized scope" into udc-dev am: 1f61ce84 am: b8a75f46

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



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