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: I28bea0d2c9ac31e3a53b8c6eadbe70a648fd3646
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>