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

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



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