am eb6c0d5d: am 282c51d3: Merge "Updating time/alarm tiles, fixing issue with empty space under QuickSettings (Bug 7205141, Bug 7222371)" into jb-mr1-dev

* commit 'eb6c0d5d159e643cfa0c7e48c11c12339e3f1c9d':
  Updating time/alarm tiles, fixing issue with empty space under QuickSettings (Bug 7205141, Bug 7222371)