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: I0e14d94e506e3a4084123d5d7ed179410c0ff716
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>