am 7d1737e0: Reconcile with ics-factoryrom-2-release

* commit '7d1737e045ae970049e723c5b3c681860d552ad6':
  Revert "Merge "Fix WPS pin input UI" into ics-mr0"