[automerger skipped] Merge "Correct API change that was omitted due to...

[automerger skipped] Merge "Correct API change that was omitted due to checkapi failure" into 24D1-dev am: 6f1f425a -s ours

am skip reason: Merged-In I602c1ed9ce651f06486d262c48a46acd1f26ba1f with SHA-1 91a8cf15 is already in history

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



Change-Id: Id4e6b2c93c0622b2c995690e6c5445bd548e8959
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>