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

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



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