Merge "Ensure unlock icon animates" into sc-v2-dev am: b0e7bac136 am: 55cdea0463

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

Change-Id: Ia7ba6aa0e524b45feaa6359971fcc24b8511ba21