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: 770e9d7e am: b926bd0f am: 90a50738

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



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