Merge "Fixes alpha issue in lock screen shortcuts." into tm-qpr-dev am: eb34e33e am: 155e42e6

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



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