Merge "Revert consider TEMPORARILY_NOT_METERED as unmetered in data usage"