Merge "Cancel sensors for lockouts on BP." into udc-d1-dev am: 860e862c am: c0b1f1c8 am: 20ee8f05

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



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