Merge "Update PreferenceFragment behavior" into pi-car-dev am: 7ff03b1f6d am: f96b3d87dd am: 9ea1713fbd
am: 9964ebee53

Change-Id: Iedace261ea356d226b29dada986c12f4667fd9ab