Merge "Media2: Make Javadoc consistent for recommending use of AndroidX" into...
Merge "Media2: Make Javadoc consistent for recommending use of AndroidX" into qt-dev am: d1a84cb5 am: 9917209b
am: 1bac830d
Change-Id: Iea268914656816f899552293b7362a1ee4f89d44