Merge "Handle device presence registry when device is already active." into tm-dev am: fb9cbc6a

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



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