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

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

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



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