[automerger skipped] Merge "Cleanup: use shared apex_key" into main am:...

[automerger skipped] Merge "Cleanup: use shared apex_key" into main am: a232f9f1 am: cd05b33e -s ours am: 3d2b5fc2 -s ours

am skip reason: Merged-In Ib04e5b2f1f2719b040656237f3759502d14e3d3e with SHA-1 bc09e453 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2780369



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