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: d292c00c am: 49b66863

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



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