[automerger skipped] Merge "Use the correct Smart Storage flag in SettingsLib." into pi-dev am: b8c9dace53
am: 8970bc35e6 -s ours
am skip reason: change_id I9802d307597d90514e7dc6631998daa1d2fab253 with SHA1 10a6994d86 is in history

Change-Id: I750ec81ea085bccd57b1800ebc00dfe543be4434