Merge "Support properties in path when merging overlay configs" into main am:...

Merge "Support properties in path when merging overlay configs" into main am: 9cdfcfb2 am: 0c5ddec4

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2985494



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