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

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

Change-Id: I8a6526187f1388b3eadf64a82f519f94ba51f4cf