Merge "Merge "Merge "Revert non-API changes to not throw...
Merge "Merge "Merge "Revert non-API changes to not throw UserOperationException any more" into rvc-dev am: 960e4933 am: 0880adf5" into rvc-d1-dev-plus-aosp am: 58893e0c" into rvc-qpr-dev-plus-aosp