Merge "Track the symlink /root/adb_keys in the build system properly" into...

Merge "Track the symlink /root/adb_keys in the build system properly" into main am: 4220f93a am: a989a0bc

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



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