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