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

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



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