Merge "Merge "Remove SystemUIFactory.getHomeLayoutId()" into nyc-mr1-dev am: 84c074adb2" into nyc-mr1-dev-plus-aosp
am: 64a2480f6c

* commit '64a2480f6c598f037376fea98fcde09ea53c68de':
  Remove SystemUIFactory.getHomeLayoutId()

Change-Id: I256c9e6d7ceec6ae7848d0cd10dd5cd4190c982f