Merge "[automerger skipped] Merge "Allow Descrambler.add/removePid to pass a...

Merge "[automerger skipped] Merge "Allow Descrambler.add/removePid to pass a nullable optional filter" am: 0b8ff8e0 am: 012a4243 am: 3ae46e50 -s ours" into sc-dev am: b6a26615 -s ours

am skip reason: skip tag Change-Id Icf7d9526fa15dc11b23e9f73dbfceee748640772 with SHA-1 316b045b is already in history

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

Change-Id: Ia5afddf36a27e508bdb088d2e493766584ca1d6e