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