Merge "Stop creating sdk data directories due to boot time regression" into tm-dev am: 1648aa42cf

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

Change-Id: Iec6ee9577ee262485951060bb93e5256940c4563