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

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

Change-Id: I735c10c108f33ebb92448dc14bd79e6f4ef50ff5