Merge "grant shell user EXPAND_STATUS_BAR permission" into jb-mr1.1-dev