Merge "Revert "Do not enable Settings.Global.ADB_ENABLED on the emulator"" into main