Android 10.0.0 release 40
Merge "Revert "media: disable Codec 2.0"" into qt-dev
am: 3df5ecdf90

Change-Id: Ic90deb0086fe87290e5a601b811235163c93e1d2