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

Change-Id: Ic8e0ab2331f803272f11324eb5dbefe42f369284