Merge "Add storage manager settings activity." into nyc-mr1-dev am: 798a28ace9 am: 4ee3ce5732
am: 8cf30cafff

Change-Id: If1fe711464ea3796a3c2cc3035c92ee66e437e19