[automerger skipped] Merge "DO NOT MERGE Removes additional subtypes when clearing data." into udc-dev am: 470999f6 am: 4c265a20 -s ours

am skip reason: subject contains skip directive

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



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