Merge "Settings: Add a javadoc note for WIFI_MIGRATION_COMPLETED" into rvc-dev am: 198e8c36 am: 0ec9c360 Change-Id: I1cba24416b1af2fce1eb716c561b181260cbd8ad