Merge "Treat device storage as a single preference." into arc-apps
am: 75d910b783

Change-Id: Ia1a9fa7593a50bae264bd6b745491171aaa8285b