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

Change-Id: Iae86329fc174337d2ad139c22c1d29a6e757dbdc