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: caa66e34 am: a85036a2 am: d2731ff9

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



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