[automerger skipped] Merge "Update API txt following a metalava fix" am:...

[automerger skipped] Merge "Update API txt following a metalava fix" am: 4fc41b4f am: 34c8a856 -s ours

am skip reason: Merged-In Ideb34ab78c9a8fc4d589e58e810316b6f36b7a43 with SHA-1 eaf26d5a is already in history

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

Change-Id: Ifc8748e8cddc3296bfaaded9ba45975ca41bd6f4