Merge changes from topic "block-alarm-manager-bal-S" into sc-qpr1-dev am:...

Merge changes from topic "block-alarm-manager-bal-S" into sc-qpr1-dev am: e37105e4 am: e6759999 am: 1b5f6b41

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



Change-Id: Ie15e251de5cf3d5ba020f7dff888b4688ec419eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>