Merge "Don't add API annotations in the internal R.java" am: 0ad81868da

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

Change-Id: I87b2c79a4ace04e4b24273b26ec557aa276d7c40