Bug: b/272626712 Test: Added and verified affected atests pass Change-Id: Ie07f80d608b78dfce3309533ac02d9a907e5e7b4