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: I648232afcb30aee7ca16bd3e5e9b88efe47739c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>