Merge "media: make ParameterDescriptor static" am: 201c39ba90 am: e29ed20fff am: 1632f384c0

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

Change-Id: I243bb389f22e0f651aef0397f24aee7c12af7ad0