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

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



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