[automerger skipped] Don't remove devices on onHotplug() am: c188a568 am:...

[automerger skipped] Don't remove devices on onHotplug() am: c188a568 am: d27da810 am: 4b324cc6 -s ours am: 0381f99f -s ours

am skip reason: Merged-In I4181b4650b70101da44fd205e4df9eb566f74496 with SHA-1 900536cf is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2039064



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