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

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

Change-Id: Ie76c063c322c50af2a6c0ae508905eae061024bf