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

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



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