[automerger skipped] Merge "Clean cherry-pick 'Display Forbidden State during Manual Network scan."" am: 1daa3b3dbc  -s ours am: 82c553fec4  -s ours am: c924124f88  -s ours
am: 4ea3fb665c  -s ours

Change-Id: I5a836bdf795e8334284cfc0140fa84b5f2b0eacd