[automerger skipped] Merge "Implement getInterfaceHash/Version" into...

[automerger skipped] Merge "Implement getInterfaceHash/Version" into sc-v2-dev-plus-aosp am: b802bd9e -s ours am: 401ebc64 -s ours am: 30b52e80 -s ours am: 47996fb8 -s ours

am skip reason: Merged-In Ibbe77954bb46ecbdde567d4b74cb26b92a4c5b98 with SHA-1 3e973212 is already in history

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



Change-Id: Icf6e4e2297688571ee7e324749b57e3cb4be2e33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>