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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib6c54fc7ef4c18bbf73dfdd549934fcf72edbc8c