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

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



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