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

[automerger skipped] Merge "Implement getInterfaceHash/Version (health)" into sc-v2-dev-plus-aosp am: 94db86b8 -s ours

am skip reason: Merged-In I01dda85890dae59082067e4b38c0f50d493cd22d with SHA-1 ec55bbd8 is already in history

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



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