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