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

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



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