DO NOT MERGE Removes additional subtypes when clearing data.

Bug: 267124364
Test: manually tested the case.
Change-Id: I159d9b7a2d1dcc8df478bb45d0be706d615724a2
(cherry picked from commit 18a26c88a8c73d18b3aedf513ad4dc4c698fbf0e)
1 file changed