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

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



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