Merge "Create sdk directory for an app only if app consumes sdk" into tm-dev...

Merge "Create sdk directory for an app only if app consumes sdk" into tm-dev am: 4781c8b2 am: 71ed199b

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

Change-Id: I1104b16ffaf52378cfda2ee242aeb6031ea9c252