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

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

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