Merge "Copy layout file of preference category from Settings." am: 03c6030ce9 -s ours am: 176b656fb2 -s ours
am: d303f80780 -s ours
Change-Id: I24636a030808fe4125c5ac0eef3d41233ee3bb17
This commit is contained in: