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