[automerger skipped] Merge "DO NOT MERGE Uses equals to compare the old/new subtypes." into udc-dev am: 42570f58 am: 3739c60d -s ours

am skip reason: subject contains skip directive

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



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