[automerger skipped] Stop creating sdk data directories due to boot time regression am: f4aae9ee08 am: 87f63f8410 am: 8934416fcd -s ours am: 844719d9db -s ours

am skip reason: Merged-In I3b74e34344ceb161d584c98bcb816d3dff3fd392 with SHA-1 7f732f19ed is already in history

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

Change-Id: Ia536940ed9e9fb533c8e951dc445b8f11c2300e8