[automerger skipped] Merge "New API for comparing two intents of PendingIntent...

[automerger skipped] Merge "New API for comparing two intents of PendingIntent object." am: 687da317 am: 46a371b4 am: a8469c27 -s ours am: c4bbeabb -s ours

am skip reason: Change-Id Ic5eb20f94ff6fd6953315a5f848effa25b813da7 with SHA-1 e48076b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I252fb48bf2e4e66312e583893d3c64c52ee1ffcb