Merge "Use the correct Smart Storage flag in SettingsLib." into pi-dev
am: b8c9dace53

Change-Id: Id04613a0bbe6c2147a9fc176c5add96d12ed6d46