Don't remove devices on onHotplug() am: c188a56888 am: d27da8101b

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

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