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

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



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