Merge "Add equal overloads to some MediaDescription and MediaQueue objects (2/3)" into oc-mr1-dev am: 619503b279
am: 8fdd245b7e

Change-Id: Ie1cc15209b789e271615ccd07b0c89d00d5627e8