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

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

Change-Id: I6895f9fe17792b993cdf0c4f36433a8ffb55dc56