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

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

Change-Id: I09ae59306dd99fd85f942cded6c5fbd6e15ec234