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

Change-Id: Iea268914656816f899552293b7362a1ee4f89d44