[automerger skipped] Merge "Add HIDDEN_API_POLICY to @TestApi.i" am:...

[automerger skipped] Merge "Add HIDDEN_API_POLICY to @TestApi.i" am: c6b54a3a am: ab5ea0c1 am: 4c1da9c0 am: 8147357d -s ours

am skip reason: Change-Id I68231850a000243cd01ba066585322cab7608884 with SHA-1 b2f0ce1c is in history

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

Change-Id: Ib7f5e57446dd4f03aef33f64bbbcfcf78f351993