[automerger skipped] [RESTRICT AUTOMERGE] Attempt to fix exception in IMS am: 468f72f016 am: f46221dee1 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I8849b35b2fc9d457ded1b4f7d9085cf98d1a6616