Merge "Enable @TestApi access for instrumentation." am: f1d5754c10 am: e0ef4a9aab

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibaba3d4287cb970703f1f071f6373d5205ba94e1