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

Change-Id: I8de3f917f5865ab9626fe0a3373b75a39d2f3b0d