Bug: 119305624 Test: normal/recovery boot aosp_taimen Change-Id: I46da995886ce421bb87e741d577f659426ff79c4