Merge "Add unlocked LS => locked AOD transition" into sc-v2-dev am: a66bc891ce am: 570547c891

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

Change-Id: I62dfb143a7bdfa761220a04cd4862704ab6f7e06