Merge changes from topics "goldfish-source_prop-cleanup", "goldfish-source_prop-versions" into main am: b93bbddd50

Original change: https://android-review.googlesource.com/c/platform/development/+/3408239

Change-Id: I84f2611864418f0a1d7a9e274076f0add563c42b
Signed-off-by: Automerger Merge Worker <[email protected]>