[automerger skipped] Merge "Don't add API annotations in the internal R.java"...

[automerger skipped] Merge "Don't add API annotations in the internal R.java" am: 0ad81868 am: e7105c39 -s ours am: d10d8981 -s ours

am skip reason: Change-Id I613e8611ddaf5f8e4761d351d4cd0142d59c7cc9 with SHA-1 de6e6f20 is in history

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

Change-Id: I8ed42dea534f8552c9622f6e82d27e85db7b969b