Mark ab/11976889 as merged in aosp-main-future Bug: 347831320 Merged-In: Icaa87329ebb7bc1f91a6ccbdc537784e43facbf5 Change-Id: Ifb1cd4dccbed19c1fc71eeb255229ae64230d34a