Merge "Move adb_keys to product partition" into main am: cdca5ed76e

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3244206

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