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

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

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



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