[automerger skipped] Merge "[RESTRICT AUTOMERGE] Attempt to fix exception in...

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Attempt to fix exception in IMS" into sc-v2-dev am: 531458f8 am: 154104cc -s ours

am skip reason: subject contains skip directive

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

Change-Id: I8edcae2e95197de8ac2e4d106a7c2ce2db0e494e