Merge "Remove preference category in zen mode alarms page" into tm-dev am: cbc67a41 am: a7fcd556

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

Change-Id: I8aa73de194835983d45408f8ecacde916284430f