Merge "Trigger watchdog only if operation is not complete" into udc-qpr-dev...

Merge "Trigger watchdog only if operation is not complete" into udc-qpr-dev am: 23907da1 am: 372c6e6c

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



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