Merge "Do not canonicalize overlay config test paths" into sc-dev am: 890daeb0

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

Change-Id: I9e203f3d4b2bb5d5138183a62c0d7426b4b26261