Merge "Update JavaDoc reference to AndroidX Test" am: 9ec2ad9dc6 am: d632eacf92 am: 961ad9339b am: 95ff73851c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1356342

Change-Id: I2435c661c5b8c3a2e026559c0729d3c964273660