am ed10c013: am 36bde9a9: Merge "Add fake CustomContent screen for testing Launcher interface" into ub-launcher3-burnaby

* commit 'ed10c013bd6f6775cd6bb834283303deed55daa7':
  Add fake CustomContent screen for testing Launcher interface