Merge "[BugFix]: Remove the android property used by GXP debug dump [RESTRICT AUTOMERGE]" into udc-d1-dev am: 539fdaaa37 am: 75efde30dd

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs-common/+/23736622

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