Merge "media: make ParameterDescriptor static" am: 201c39ba90

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

Change-Id: I61c83705059bbb78b0096e52d3a0a02eeceb7220