Merge "Create system API for reconciling sub directories of sdk data" into tm-dev am: 9bdc17bb am: e91395c6

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

Change-Id: Idd5cadbf0be9ef03eb117d8d4df0faf73a908395