[automerger skipped] Merge "Moving over core/api/*txt files" am: d93ed004...

[automerger skipped] Merge "Moving over core/api/*txt files" am: d93ed004 am: d2c48ad2 am: b5f6cf1c am: bdd60d42 -s ours

am skip reason: Merged-In I636f00132a13467e63b08f21d9cc9dcaab250b8a with SHA-1 8e30577d is already in history

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

Change-Id: Ic9c9a33acb4c988a8d13795549c21b9749e69cd3