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

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



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