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

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



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