Fix issue with alphas not being applied to the same view on unlock am: acb755ce am: d3366bef

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

Change-Id: Ic22a340c1f5d6db3e0a480cd5fce05cc6c222cb2