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