am 2b847c39: Merge "Removing unecessary additional lock metadata from QuickSettings user tile." into jb-mr1.1-dev

* commit '2b847c39336024a958742195de4f406e7aa79540':
  Removing unecessary additional lock metadata from QuickSettings user tile.