Merge "Settings: Add a javadoc note for WIFI_MIGRATION_COMPLETED" into rvc-dev am: 198e8c36 am: 897f2733 Change-Id: Ib053625ff0ccc83707f8de27c75178dd33d95b59