[automerger skipped] Merge "Add unit test for IccLogicalChannelRequest" am:...

[automerger skipped] Merge "Add unit test for IccLogicalChannelRequest" am: 7586273c am: 0e9a6c92 am: b778a2b2 -s ours am: d045825a -s ours am: c1b65b08 -s ours

am skip reason: Merged-In I1b63aba7cb9e86baddddf1c20d38d0b5d1f78e55 with SHA-1 1c4ddf5f is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2037463

Change-Id: Iea99b08d844282bdd3386d6eb2335cc4394ae4b5