Merge "Tighten up Doze alarm timing." into sc-dev am: 41e40c69 am: 355b7ebc am: 78a22c7a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14737990

Change-Id: Id2e526f41960389e007bb26f0451550a506743f4