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

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

Change-Id: I77498ca59d79f086cce69ac9f4fbd1dde7f8d143