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