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

Change-Id: Ib2c4d023f26564833619edf2a4ad8eb28c4a29a6