Merge "Handle device presence registry when device is already active." into...

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

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



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