Merge "Only show BootSounds preference if has_boot_sounds is true." into...
Merge "Only show BootSounds preference if has_boot_sounds is true." into nyc-mr1-dev am: 1ff11c5e am: cf583410
am: e005d2bc
Change-Id: Ie1f05158d2c0515b70e76712173fcfd5cff538e5