Merge "media: avoid NPE in CodecCapabilities.createFromProfileLevel" into nyc-dev am: 9061b26f1e
am: 12273862c3

* commit '12273862c3530d261ddb92ce087c4be9751de48d':
  media: avoid NPE in CodecCapabilities.createFromProfileLevel

Change-Id: I6f0c0b97a027998a22cba5109ecc70f53cba6ea9