Merge "DisplayCutout: Add emulation option to DeveloperSettings"