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

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3244707



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