Merge "Update API txt following a metalava fix" into sc-dev am: 0d41eef5 am: f35e7b98 am: 73d9593d

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

Change-Id: I425fa126f0125e4db82663a8d57a23ae8b0276cc