Merge "Merge "Wrap start and stop user clients in an operation." into sc-dev am: 64051356 am: 06efaf34" into sc-v2-dev-plus-aosp am: d316c034

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

Change-Id: I813bd2e48a7c8e9ed54f38060402d57016117cad