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

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

Change-Id: I387bd25fefb91088c23c6d2e8a3786d2e498e783