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

Change-Id: I3b117ad83dfb3896fdd6b59ca9984d45764decc6