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

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



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