Merge "Update mState if try again is successful" into 24D1-dev am: 1e1fe719

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



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