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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I24e06e80f4300910535a41bc0fcf6630c3075c4a