Merge tag 'android-11.0.0_r48' of https://android.googlesource.com/platform//packages/apps/DeskClock into r

Android 11.0.0 Release 48 (RD2A.211001.002)

Change-Id: I7015634cde58a00a14d807380b8cf2cb4af4f907