Merge "Add toolbar to preference fragments" into pi-car-dev am: 0d1875f804
am: e47f15aaf9

Change-Id: I460e3f1d86d8d3c6db5f6ac8629928afc4a349d2