Merge "Merge "Switch to a non-hidden way to compute data path and switch to...

Merge "Merge "Switch to a non-hidden way to compute data path and switch to subdir." into sc-dev am: aafffec2 am: 90537699" into sc-v2-dev-plus-aosp am: be3647d9

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

Change-Id: I62d9a675406bbbaf09403d510d46bd6199bd9850