Merge "Don't remove additional subtypes when ACTION_PACKAGE_CHANGED." into udc-dev am: cf1b792d am: db299367

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



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