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

Change-Id: I1435d9d111c60cc33198ead82f1ec021198c6cf5