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

Change-Id: I2e96edc9e38e64ff3923968889e10bfb3d6f956d