[automerger skipped] Merge "fs_mgr: overlay: only use system_<other> if other slot suffix not blank" into qt-dev
am: e8d1fac1a6 -s ours
am skip reason: change_id Ib929d242e7cc4953096eb6300bcf7888ce2259ab with SHA1 38af717a83 is in history

Change-Id: I2496dfb16e6b9edadec038d9aca346e8812e00b5