[automerger skipped] Merge "Also update manage profile state after a...

[automerger skipped] Merge "Also update manage profile state after a transition finishes" into udc-qpr-dev am: c74cee43 am: d043fba2 -s ours

am skip reason: Merged-In Ie3cc6fe3943672f6c33cb4cc2c2380b13d96d83d with SHA-1 f41e6867 is already in history

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



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