Merge "Also update manage profile state after a transition finishes" into...

Merge "Also update manage profile state after a transition finishes" into udc-qpr-dev am: c74cee43

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



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