Merge "Move adb_keys to product partition" into main am: 1a3f842d

Original change: https://android-review.googlesource.com/c/platform/build/+/3243935



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