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