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

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

Change-Id: Ic76b583ad34d392bcc01672ca41471ee0475ec47