Merge "Remove simulated device from "present" list when disassociated." into...

Merge "Remove simulated device from "present" list when disassociated." into tm-dev am: 7dafec61 am: b665666f

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



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