Merge "Copy layout file of preference category from Settings."
am: 03c6030ce9  -s ours

Change-Id: Ibacd6e572b31105fe3afe1a904c15ed1d610fc41