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

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

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