Merge "Specify product_specific property in adb_keys" into main am: 3d425541f2

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

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