[automerger skipped] Merge "Shell: Allow retrieval of wifi network credentials" am: 619cd57c1f am: b2c6b12cfb -s ours
am skip reason: Change-Id I6881003510191f667950be1ab27a5399fe3914b4 with SHA-1 75dbcfff98 is in history

Change-Id: Ic712b0ee99be31ba5a97a2adac54240ebbb56a33