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