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

Change-Id: I317a83b5acc98fa7ea92c7b59d7c3a39e66be316