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