Merge "Add flags for new unlock and smartspace transition." into sc-dev am: bba0b75b am: c45ea687 am: 96781d06

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

Change-Id: Ie9cd412607bac2519f652a56df55877dc73961a8