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