am 17990395: Merge "Fix issue #6717667: expanded notification actions don\'t...
am 17990395: Merge "Fix issue #6717667: expanded notification actions don\'t work on the lock screen" into jb-dev
* commit '17990395':
Fix issue #6717667: expanded notification actions don't work on the lock screen