[automerger skipped] DO NOT MERGE Uses equals to compare the old/new subtypes. am: 4507d65f91 am: 784b2ac432 -s ours

am skip reason: subject contains skip directive

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

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