[automerger skipped] Merge "Do not canonicalize overlay config test paths" into sc-dev am: 890daeb0 am: 3979ee87 -s ours am: 4ed92423 -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: Ie1022f566aeba5323e3f29a8679a4ddf3b3367e9