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

Change-Id: I8a24fccc5b30546c1c16e2c720d77b248bbcb40a