[automerger skipped] Merge "Add pkg target to snoozing alarm" into oc-mr1-dev...

[automerger skipped] Merge "Add pkg target to snoozing alarm" into oc-mr1-dev am: 119ebe19 -s ours am: c5cd3bcb -s ours am: 6c6d48d2 -s ours

am skip reason: Merged-In I6aaf80a11dcae2eca41d4647411126ed41587027 with SHA-1 b3415238 is already in history

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

Change-Id: I4e32359519eb0b157070cef6f327f019ec79eff4