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

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

Change-Id: Iecfeb4ab0770bb094f2c15ef394c368adee900cf