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

Change-Id: I2bc5ac0044d0c042a00a1b9f75c80eb91620961b