Merge "Cleanup: use a shared apex_key" into main am: b0675a2ecb am: 5c90b3b7f1

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

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