Merge "Add HIDDEN_API_POLICY to @TestApi.i" am: c6b54a3a9c am: ab5ea0c1c5

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

Change-Id: I4cb38bce944212ee3487279a01934009bc7ba418