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