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

Change-Id: Ib6a50aa5aedbb0183343334aa39a4f2c5f1f6698