[automerger skipped] Fix the OPTIONS request does not handle that the...

[automerger skipped] Fix the OPTIONS request does not handle that the capabilities are retrieved from cache. am: 01f5cd10 am: cec5e1ea -s ours am: 15d56d31 -s ours

am skip reason: Merged-In I0e05f5f6a0b0e543cc498beae8b2cb053b91a94d with SHA-1 3b3370f9 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ims/+/1715692

Change-Id: I364524fc275c5ee754dc0a09fec34ef92b9c393a