[automerger skipped] DeskClock: Fix alarm clock screen show black  when screen locked; am: 4ba26ea8d8 -s ours am: d95f940685 -s ours am: bfbd31ea20 -s ours am: d137270e5c -s ours am: 95a9799a46 -s ours

am skip reason: Change-Id I69c44571cd86c21203311c89081c8935d5ed1450 with SHA-1 770f2b2aa7 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/12162447

Change-Id: I211b17fbf91e878945aa7b00d9cc234099f8d0d7