Merge "DO NOT MERGE Removes additional subtypes when clearing data." into udc-dev am: 470999f6

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



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