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

am skip reason: subject contains skip directive

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



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