Merge "Perform cleanup operation on destroy()" into udc-dev am: 75b18738

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



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