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: 30433c97 am: ba739bc0 am: 9ce1a101

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



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