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

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



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