[automerger skipped]Merge "new WFC registration failure notification string" am: 8bcb7aa971
am: 88959d3ceb  -s ours

Change-Id: I0dc40d059ea8e7ccfe3f4974f7ee4d248e147890