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

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



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