[automerger skipped] DO NOT MERGE Uses equals to compare the old/new subtypes. am: 4507d65f am: 126139b1 -s ours

am skip reason: subject contains skip directive

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



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