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