Merge "Ensure current operation has not changed on start/stop user...

Merge "Ensure current operation has not changed on start/stop user operations." into sc-dev am: 92ce6e95 am: 86c9720a

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

Change-Id: I8ddabbc0f3d9ee95964311f8ad133f9f03f5be72