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

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



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