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