Merge "Ensure ST does not remain requested after error" into udc-dev am:...

Merge "Ensure ST does not remain requested after error" into udc-dev am: 187b8ecf am: 9493478b am: 8c335a39

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



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