Merge "Continue searching for device state after exception" into tm-qpr-dev am: 5b7da895

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



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