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