[automerger skipped] DO NOT MERGE Removes additional subtypes when clearing data. am: 0962b36f9f am: 1bf84468da -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie44cf1537bc0d4ad281c2287cfff0c4f16b53034
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>