Merge "Merge "media: MediaCodecInfo: remove PerformancePoint logs" into qt-dev am: 6de33e1c" into qt-dev-plus-aosp