Merge "Merge "Invalidate recognition token if model is stopped" into udc-dev...

Merge "Merge "Invalidate recognition token if model is stopped" into udc-dev am: 9204df37 am: 52541c26" into udc-d1-dev-plus-aosp am: 8386be16

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



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