Merge "Update API txt following a metalava fix" into sc-dev am: 0d41eef54b am: f35e7b980e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14640410 Change-Id: I5a10d72a5102b0e42269f0d503c167eab7ba5321
This commit is contained in: