Merge "Moving over core/api/*txt files" am: d93ed0045d am: d2c48ad201

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

Change-Id: I5a83a5def064d09a34d62460afa0ef3c5cc424b4