Merge "Show unlock icon on AOD" into sc-v2-dev am: 9c557cdf9a am: 46ff602d9a

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

Change-Id: I783e9601ad1e04be8bb21c31397f7f393fdfeee8