Merge "Media2: Make Javadoc consistent for recommending use of AndroidX" into qt-dev