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

am skip reason: subject contains skip directive

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



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