Merge changes from topic "explicit-keyguard-occlude-flags" into udc-dev

* changes:
  Don't let expanding notification shade cancel unlock
  Transition flags for Keyguard un/occlude/cancel