[automerger skipped] Merge "Do not canonicalize overlay config test paths"...

[automerger skipped] Merge "Do not canonicalize overlay config test paths" into sc-dev am: 890daeb0 -s ours am: be9e2a41 -s ours am: a6162120 -s ours

am skip reason: Merged-In I511e24b7ccfe82e6e89ceea7107457439793ef77 with SHA-1 2c968557 is already in history

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

Change-Id: I90b6a7fa6752593a53c3d0ba2152f84f3bf334a4