Merge "Add two more enums to LauncherState" into rvc-dev am: d53382b05d

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

Change-Id: I795a4db555825cea63b97764ecef68ca3a106d41