Merge "Fix ST recognition requested after start error" into udc-dev am:...

Merge "Fix ST recognition requested after start error" into udc-dev am: 7c33508e am: bec28e5a am: 11288f5d

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



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