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

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

Change-Id: I47f5ad2ac00ce65055b603fa27b8f21dd3729f27