Merge "Add explicit dependency from android.test.base to hiddenapi annotations" am: d9373ecdaf

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6190f76d0c49b3e276d685fce401827539699b68