[automerger skipped] Merge "Enable @TestApi access for instrumentation." am: f1d5754c10 am: e0ef4a9aab am: 7c54084978 -s ours

am skip reason: Change-Id I8dd3bbacdb263a3e30539f43d8081f6d78e80155 with SHA-1 6609105eb5 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a6de6d964b892f492ee70998b09ab6eb9cef326