Merge "Allow Descrambler.add/removePid to pass a nullable optional filter" am: 0b8ff8e00e

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

Change-Id: Ifdbe40af2a6e8e6b70ad9689a819e4c5b793a978