Merge changes I976533b0,I1528bb3e am: a35d6ae683 am: 9e503465e1 am: 3e5d510ced

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

Change-Id: I9ebb6c193eaca2624c319b80a7650c72b4848886
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>