Bug: b/80258696 Test: build aosp_x86-userdebug ; run emulator Change-Id: If7de24c3fc91a143c0bd17c6364c56ec04dfb08e (cherry picked from commit dac8340c)