Merge "media: fix issues with video profile levels am: 2fc9c6925a am: 49f982ec7b" into nyc-mr1-dev-plus-aosp