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

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



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