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

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

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