Merge "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" into rvc-qpr-dev-plus-aosp am: d140902f7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11859726 Change-Id: Ie31d4b19064e7417a407ed6c31dbbec0fd202511
This commit is contained in: