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: 3f8e88f0

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



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