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

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

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

Change-Id: I6a36eff2a04841d3ffa6a8884387379c04a64029