Merge "Add the UPGRADE_DATA_MIGRATION_STATUS setting which indicates whether the data migration on device upgrade on T has finished or not"