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

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

Change-Id: Id4f0c3676ac6a0e6c749205cbc7f335971b11d4f