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

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



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