Merge "RESTRICT AUTOMERGE Allowlist alarm-clock alarms from pre-S apps for FGS"