[automerger skipped] Merge "Strictly deprecate IRPC test mode key generation" into udc-dev am: 01b99d1baa am: 3fe217345d -s ours

am skip reason: Merged-In I5709a0b1cd77eb28e677f64bb781fad58d91570a with SHA-1 18a1915f04 is already in history

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

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