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

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

Change-Id: I5d7de95191f9da3b23ea1ed6ba3851b2958181fd