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

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

Change-Id: If0f8632fc8630f283a060dbc573607b602012286