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