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

[automerger skipped] Merge "Implement getInterfaceHash/Version (omapi)" into sc-v2-dev-plus-aosp am: 4b46cc19 -s ours am: 52710c23 -s ours

am skip reason: Merged-In I274f847ed8156acd0c4b288e306fcab2d380bcd5 with SHA-1 df1fa99b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17716148



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