Merge branch 'pie-gsi' of https://android.googlesource.com/platform//packages/apps/DeskClock into HEAD

Change-Id: I087c047d0ddd9075b47b0ca30e1ef11f69215a2b