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