Merge "Unbind from overlay before checking attached." into tm-dev am: d5e4503c

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



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