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: Id6b2d13d301ca05d0885ebe2f74c6c25c0c75a63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>