Merge "Fix use after delete reference for device" into udc-dev am: c4f356dd am: c092ce36

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



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