Bug: 364383722 Test: presubmit, internal build for relevant device Change-Id: I7ab3ab54e946a40d6c69c0bc1234d4032c89370e