This reverts commit dc5e0627. Test: lunch sdk_phone_x86-userdebug make -j emulator it should boot to homescreen BUG: 76125889