[automerger skipped] Merge "Use IntentFilter CREATOR directly for serializing...

[automerger skipped] Merge "Use IntentFilter CREATOR directly for serializing ParsedIntentInfo" into rvc-dev am: a29bdb9e am: 1928716b -s ours am: 0221168d -s ours am: 12465398 -s ours

am skip reason: Merged-In Ib12e0a959eb5a5d73d5832ff2eee26a30eed5ded with SHA-1 7ac9b1da is already in history

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

Change-Id: I08dad2fe197b811f92aaca3b282359dc1ff23c87