Merge "Merge "Revert non-API changes to not throw UserOperationException any more" into rvc-dev am: 960e49335a am: 0880adf50a" into rvc-d1-dev-plus-aosp am: 58893e0cb9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11859726 Change-Id: I2a3eaea410b4e9b240a3782c894375c963445aed
This commit is contained in: