[automerger skipped] Merge "[ANAPIC Review] Update the...

[automerger skipped] Merge "[ANAPIC Review] Update the getHalDeviceCapabilitiesResponse since the config/1.3/types.hal is removed" am: e9b54543 am: 53c23524 am: 44704f0a -s ours am: 0c0ce0db -s ours

am skip reason: skip tag Change-Id I3848313aca6d25979d2e7a9fbee699965d12f03f with SHA-1 d6aa0694 is already in history

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

Change-Id: Ibb7a33f9cb171c773df8d4b4fc5f1db51da6e1e3