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

Merge "Switch to a non-hidden way to compute data path and switch to subdir." into sc-dev am: aafffec2 am: 030480e5

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

Change-Id: Ife673e4befad29d0f1e6eb0b79f52ca6671b9a33