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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I85cd5a81c98aa96629f0e2cad9e7a45ec3e5faac