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

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



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