Merge "Merge "Use ScopedLocalRef instead of env->DeleteLocalRef" into udc-dev am: 2d4cc167 am: 4176ea5d am: c8d55d70" into udc-qpr-dev-plus-aosp am: 50e1cbac

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



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