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