[automerger skipped] Implement getInterfaceHash/Version am: 2f48bf04 am:...

[automerger skipped] Implement getInterfaceHash/Version am: 2f48bf04 am: 2fcff389 -s ours am: 59bfe28e -s ours am: 08ec1805 -s ours am: fe093f30 -s ours

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

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



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